-
Notifications
You must be signed in to change notification settings - Fork 0
+5,232
−6,043
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…gg in paramater. My bad
…gg in paramater. My bad
…aking new controller, to make sure authToken gets based correctly
…ontroller for register). Login needs handling
…if password is correct.
…an like show an alert.
…he original), to make use of the stage instead of only actionEvent
…ton is removed from charity.
…o to donate, heart and check hearted charities.
… user and smaller fixes
…on ) but now frontpage now scrolls and looks nice
…nto 56-user-implemention-and-token # Conflicts: # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AvailableOrganizationController.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/DonationPageController.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/BaseController.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarFooterController.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java # helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java # helpmehelpapplication/src/main/resources/fxml/aboutPage.fxml # helpmehelpapplication/src/main/resources/fxml/charityPage.fxml # helpmehelpapplication/src/main/resources/fxml/donationPage.fxml # helpmehelpapplication/src/main/resources/fxml/frontPage.fxml # helpmehelpapplication/src/main/resources/fxml/profile_org_Inbox.fxml # helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml # helpmehelpapplication/src/main/resources/fxml/profile_org_Settings.fxml # helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml # helpmehelpapplication/src/main/resources/fxml/profile_user_history.fxml # helpmehelpapplication/src/main/resources/fxml/profile_user_inbox.fxml # helpmehelpapplication/src/main/resources/fxml/profile_user_interests.fxml # helpmehelpapplication/src/main/resources/fxml/profile_user_settings.fxml
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Notable Users:
email: test@test.com
passord: test
email: p@p.com
passord: ppp